From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 23 Jan 2011 01:09:09 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5096^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a2f4f3269a20d855a271687d83ea1a3ac0d060f2;p=emacs.git

Merge from mainline.
---

a2f4f3269a20d855a271687d83ea1a3ac0d060f2